Merge releases/v4 into releases/v3#3373
Merged
henrymercer merged 45 commits intoreleases/v3from Dec 16, 2025
Merged
Conversation
Bumps the npm-minor group with 5 updates: | Package | From | To | | --- | --- | --- | | [node-forge](https://github.com/digitalbazaar/forge) | `1.3.2` | `1.3.3` | | [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) | `8.48.0` | `8.48.1` | | [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) | `8.48.0` | `8.48.1` | | [esbuild](https://github.com/evanw/esbuild) | `0.27.0` | `0.27.1` | | [eslint-plugin-jsdoc](https://github.com/gajus/eslint-plugin-jsdoc) | `61.4.1` | `61.5.0` | Updates `node-forge` from 1.3.2 to 1.3.3 - [Changelog](https://github.com/digitalbazaar/forge/blob/main/CHANGELOG.md) - [Commits](digitalbazaar/forge@v1.3.2...v1.3.3) Updates `@typescript-eslint/eslint-plugin` from 8.48.0 to 8.48.1 - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.48.1/packages/eslint-plugin) Updates `@typescript-eslint/parser` from 8.48.0 to 8.48.1 - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.48.1/packages/parser) Updates `esbuild` from 0.27.0 to 0.27.1 - [Release notes](https://github.com/evanw/esbuild/releases) - [Changelog](https://github.com/evanw/esbuild/blob/main/CHANGELOG.md) - [Commits](evanw/esbuild@v0.27.0...v0.27.1) Updates `eslint-plugin-jsdoc` from 61.4.1 to 61.5.0 - [Release notes](https://github.com/gajus/eslint-plugin-jsdoc/releases) - [Commits](gajus/eslint-plugin-jsdoc@v61.4.1...v61.5.0) --- updated-dependencies: - dependency-name: node-forge dependency-version: 1.3.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: npm-minor - dependency-name: "@typescript-eslint/eslint-plugin" dependency-version: 8.48.1 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: npm-minor - dependency-name: "@typescript-eslint/parser" dependency-version: 8.48.1 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: npm-minor - dependency-name: esbuild dependency-version: 0.27.1 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: npm-minor - dependency-name: eslint-plugin-jsdoc dependency-version: 61.5.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm-minor ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps the actions-minor group with 2 updates in the /.github/workflows directory: [ruby/setup-ruby](https://github.com/ruby/setup-ruby) and [actions/create-github-app-token](https://github.com/actions/create-github-app-token). Updates `ruby/setup-ruby` from 1.268.0 to 1.269.0 - [Release notes](https://github.com/ruby/setup-ruby/releases) - [Changelog](https://github.com/ruby/setup-ruby/blob/master/release.rb) - [Commits](ruby/setup-ruby@8aeb6ff...d697be2) Updates `actions/create-github-app-token` from 2.2.0 to 2.2.1 - [Release notes](https://github.com/actions/create-github-app-token/releases) - [Commits](actions/create-github-app-token@v2.2.0...v2.2.1) --- updated-dependencies: - dependency-name: ruby/setup-ruby dependency-version: 1.269.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: actions-minor - dependency-name: actions/create-github-app-token dependency-version: 2.2.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: actions-minor ... Signed-off-by: dependabot[bot] <support@github.com>
This more closely reflects the published naming https://docs.github.com/en/enterprise-cloud@latest/admin/data-residency/about-github-enterprise-cloud-with-data-residency
Mergeback v4.31.8 refs/heads/releases/v4 into main
…r-38a2a793c5 Bump the npm-minor group with 5 updates
…thub/workflows/actions-minor-dc476f2f5b Bump the actions-minor group across 1 directory with 2 updates
Bumps the actions-minor group with 1 update in the /.github/workflows directory: [ruby/setup-ruby](https://github.com/ruby/setup-ruby). Updates `ruby/setup-ruby` from 1.269.0 to 1.270.0 - [Release notes](https://github.com/ruby/setup-ruby/releases) - [Changelog](https://github.com/ruby/setup-ruby/blob/master/release.rb) - [Commits](ruby/setup-ruby@d697be2...ac793fd) --- updated-dependencies: - dependency-name: ruby/setup-ruby dependency-version: 1.270.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: actions-minor ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 6 to 7. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](actions/download-artifact@v6...v7) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-version: '7' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 5 to 6. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](actions/upload-artifact@v5...v6) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
Remove `AnalyzeUseNewUpload` FF and make its behaviour the default
…thub/workflows/actions/upload-artifact-6 Bump actions/upload-artifact from 5 to 6 in /.github/workflows
…thub/workflows/actions-minor-8751820eb1 Bump ruby/setup-ruby from 1.269.0 to 1.270.0 in /.github/workflows in the actions-minor group across 1 directory
…ws/actions/download-artifact-7
…thub/workflows/actions/download-artifact-7 Bump actions/download-artifact from 6 to 7 in /.github/workflows
henrymercer
added
Rebuild
Contributor
Author
|
Pushed a commit to rebuild the Action. Please mark the PR as ready for review to trigger PR checks. |
henrymercer
approved these changes
Dec 16, 2025
Contributor
There was a problem hiding this comment.
Pull request overview
This PR merges changes from releases/v4 into releases/v3, primarily including refactoring of GitHub variant types from numeric enums to string enums, removal of deprecated feature flags, and various dependency updates.
Key Changes:
- Refactored
GitHubVariantenum from numeric values to descriptive string values with JSDoc comments - Removed two deprecated feature flags:
AnalyzeUseNewUploadandJavaMinimizeDependencyJars - Added database upload telemetry tracking with new
DatabaseUploadResultinterface - Updated multiple dependencies including
node-forge,esbuild,eslint-plugin-jsdoc, and various GitHub Actions
Reviewed changes
Copilot reviewed 47 out of 48 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
src/util.ts |
Refactored GitHubVariant enum from numeric to string values with documentation |
src/util.test.ts |
Updated test helper to use new string enum values |
src/setup-codeql.ts |
Changed condition to check specifically for GHES variant |
src/init-action.ts |
Removed JavaMinimizeDependencyJars feature flag, replaced with direct CodeQL version check |
src/feature-flags.ts |
Removed two deprecated feature flags and refactored variant checking |
src/feature-flags.test.ts |
Updated tests for GHEC-DR and wrapped in loop for DRY |
src/dependency-caching.ts |
Removed Java JAR minimization feature flag logic |
src/dependency-caching.test.ts |
Removed tests for deleted feature flag |
src/database-upload.ts |
Added DatabaseUploadResult interface and telemetry collection |
src/database-upload.test.ts |
Updated test expectation for error message formatting |
src/api-client.ts |
Updated to use new string enum value |
src/api-client.test.ts |
Updated test descriptions and assertions |
src/analyze-action.ts |
Removed AnalyzeUseNewUpload feature flag and simplified upload logic |
pr-checks/checks/*.yml |
Updated ruby/setup-ruby and actions/upload-artifact versions |
package.json |
Bumped version to 3.31.9 and updated dependencies |
package-lock.json |
Updated lockfile with new dependency versions |
CHANGELOG.md |
Added entry for version 3.31.9 |
.github/workflows/*.yml |
Updated actions/create-github-app-token and actions/download-artifact versions |
.github/pull_request_template.md |
Clarified Dotcom environment description |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merging 5d4e8d1 into
releases/v3.Conductor for this PR is @henrymercer.
Contains the following pull requests:
AnalyzeUseNewUploadFF and make its behaviour the default #3309 (@mbg)JavaMinimizeDependencyJarsfeature flag #3352 (@nickrolfe)Please do the following:
releases/v3branch.Create a merge commitis selected rather thanSquash and mergeorRebase and merge.